Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 23 Feb 2012 20:29:29 +0000 (12:29 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 23 Feb 2012 20:29:29 +0000 (12:29 -0800)

Trivial merge